Silently ignore non-CLIPBOARD clipboards. (#156610, Christian Persch)

2004-10-27  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkclipboard.c (gtk_clipboard_set_can_store): Silently
	ignore non-CLIPBOARD clipboards.  (#156610, Christian Persch)

diff --git a/ChangeLog b/ChangeLog
index c3e8b71415eb8d789ec29f040718d7b9d7de230b..771036d320e7cc4f40bcb108d167196376f4441c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-10-27  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkclipboard.c (gtk_clipboard_set_can_store): Silently
+       ignore non-CLIPBOARD clipboards.  (#156610, Christian Persch)
+
        * gtk/gtksettings.c: Make it build on windows. (#156618,
        Kazuki IWAMOTO)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c3e8b71415eb8d789ec29f040718d7b9d7de230b..771036d320e7cc4f40bcb108d167196376f4441c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2004-10-27  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkclipboard.c (gtk_clipboard_set_can_store): Silently
+       ignore non-CLIPBOARD clipboards.  (#156610, Christian Persch)
+
        * gtk/gtksettings.c: Make it build on windows. (#156618,
        Kazuki IWAMOTO)
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c3e8b71415eb8d789ec29f040718d7b9d7de230b..771036d320e7cc4f40bcb108d167196376f4441c 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,8 @@
 2004-10-27  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkclipboard.c (gtk_clipboard_set_can_store): Silently
+       ignore non-CLIPBOARD clipboards.  (#156610, Christian Persch)
+
        * gtk/gtksettings.c: Make it build on windows. (#156618,
        Kazuki IWAMOTO)
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c3e8b71415eb8d789ec29f040718d7b9d7de230b..771036d320e7cc4f40bcb108d167196376f4441c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2004-10-27  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkclipboard.c (gtk_clipboard_set_can_store): Silently
+       ignore non-CLIPBOARD clipboards.  (#156610, Christian Persch)
+
        * gtk/gtksettings.c: Make it build on windows. (#156618,
        Kazuki IWAMOTO)
 

diff --git a/gtk/gtkclipboard.c b/gtk/gtkclipboard.c
index abb6ad26487b95d22215bfbae9cac52f86f016de..10f4793b1f3992d8803bb52ae9773e4d775ff57f 100644 (file)
--- a/gtk/gtkclipboard.c
+++ b/gtk/gtkclipboard.c
@@ -1351,7 +1351,9 @@ gtk_clipboard_set_can_store (GtkClipboard   *clipboard,
   };
   
   g_return_if_fail (GTK_IS_CLIPBOARD (clipboard));
-  g_return_if_fail (clipboard->selection == GDK_SELECTION_CLIPBOARD);
+
+  if (clipboard->selection != GDK_SELECTION_CLIPBOARD)
+    return;
   
   g_free (clipboard->storable_targets);
   
@@ -1361,8 +1363,7 @@ gtk_clipboard_set_can_store (GtkClipboard   *clipboard,
    * gtk_clipboard_set_can_store hasn't been called since the
    * clipboard owner changed. We only want to add SAVE_TARGETS and 
    * ref the owner once , so we do that here
-   */
-  
+   */  
   if (clipboard->n_storable_targets == -1)
     {
       gtk_selection_add_targets (clipboard_widget, clipboard->selection,